src: revert 20789 as alternative to 20925#20938
Closed
jasnell wants to merge 3 commits intonodejs:masterfrom
Closed
src: revert 20789 as alternative to 20925#20938jasnell wants to merge 3 commits intonodejs:masterfrom
jasnell wants to merge 3 commits intonodejs:masterfrom
Conversation
nodejs-github-bot
added
c++
Member
Author
Member
Author
|
I'm good with either this or #20925 ... This one is likely the quickest fix tho. |
2 tasks
cjihrig
approved these changes
May 24, 2018
richardlau
approved these changes
May 24, 2018
addaleax
added a commit
to addaleax/node
that referenced
this pull request
May 24, 2018
Alternative to nodejs#20938 (clean revert) and nodejs#20925 (adding the headers to the release tarball). The changes to `src/node.h` are a clean revert in the same ways as nodejs#20938 does it, the difference being that the new `.cc` files are kept here. This has the advantage of not being another large diff that other PRs will have to rebase against, especially since the split into `callback_scope.cc` and `exceptions.cc` is something that we want to keep in the long run. This essentialy implements bnoordhuis’s suggestion from nodejs#20925.
4 tasks
Member
|
Not a great fan of a full revert because it’s a large-ish change – I have had to rebase at least two PRs because of it, and I don’t exactly look forward to doing it twice again. ;) I like Ben’s suggestion from the other PR, it seems like the easiest and most long-term viable approach, so I opened #20939 with it. We could also do this PR, but in that case we should re-revert on (jasnell: edited to correct the PR link) |
addaleax
approved these changes
May 24, 2018
Member
addaleax
left a comment
addaleax
left a comment
There was a problem hiding this comment.
LGTM assuming we either re-revert immediately or only land this on v10.x
jasnell
pushed a commit
that referenced
this pull request
May 24, 2018
Alternative to #20938 (clean revert) and #20925 (adding the headers to the release tarball). The changes to `src/node.h` are a clean revert in the same ways as #20938 does it, the difference being that the new `.cc` files are kept here. This has the advantage of not being another large diff that other PRs will have to rebase against, especially since the split into `callback_scope.cc` and `exceptions.cc` is something that we want to keep in the long run. This essentialy implements bnoordhuis’s suggestion from #20925. PR-URL: #20939 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
Member
Author
|
Landed the alternate |
MylesBorins
pushed a commit
that referenced
this pull request
May 24, 2018
Alternative to #20938 (clean revert) and #20925 (adding the headers to the release tarball). The changes to `src/node.h` are a clean revert in the same ways as #20938 does it, the difference being that the new `.cc` files are kept here. This has the advantage of not being another large diff that other PRs will have to rebase against, especially since the split into `callback_scope.cc` and `exceptions.cc` is something that we want to keep in the long run. This essentialy implements bnoordhuis’s suggestion from #20925. PR-URL: #20939 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As a quick alternative to #20925 to fix issue #20921... revert the offending commits with intent to revisit the change.
/cc @richardlau @MylesBorins @addaleax
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes